packages/router-core/src/new-process-route-tree.ts (2)

812-849: 🚀 Performance & Scalability | 🔵 Trivial | ⚖️ Poor tradeoff

findMatch always redoes full extraction from scratch, discarding the incremental extract state already computed during getNodeMatch.

When includeRouteParams is set, the constructed leaf object omits extract (only node, skipped, rawParams are carried over), forcing extractParams to restart from partIndex/nodeIndex/pathIndex/segmentCount = 0 even though the winning frame may already have partially-resumed extract state from earlier validateParseParams calls along the branch. This is correct but redundant for branches that use .parse(), doing O(n) extraction twice. Worth a look if this path is hot, though likely low priority given branch depth is typically small.

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@packages/router-core/src/new-process-route-tree.ts` around lines 812 - 849,
Reuse the incremental extract state from getNodeMatch in findMatch instead of
restarting extractParams from zero. Preserve the winning leaf frame’s extract
data when constructing or passing the leaf, and update extractParams to continue
from that state while retaining existing rawParams and matchData behavior.

---

688-696: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

RouteMatchData is defined but not reused for the identical inline shapes.

The new RouteMatchData type (line 858-862) exactly matches the matchData element shape that's independently inlined three more times: RouteMatch<T>.matchData (692-696), findMatch's return type (820-824), and extractParams's return tuple (885-889). Consolidating onto the shared alias avoids the four copies drifting apart if the shape changes later.

♻️ Proposed refactor

 type RouteMatch<T extends Extract<RouteLike, { fullPath: string }>> = {
   route: T
   rawParams: Record<string, string>
   branch: ReadonlyArray<T>
-  matchData: ReadonlyArray<{
-    rawParams?: Record<string, string>
-    pathnameEnd: number
-    caseSensitive: boolean
-  }>
+  matchData: ReadonlyArray<RouteMatchData>
 }

 ): {
   route: T
   rawParams: Record<string, string>
-  matchData?: ReadonlyArray<{
-    rawParams?: Record<string, string>
-    pathnameEnd: number
-    caseSensitive: boolean
-  }>
+  matchData?: ReadonlyArray<RouteMatchData>
 } | null {

   extractedParams: Record<string, string>,
-  matchData?: Array<{
-    rawParams?: Record<string, string>
-    pathnameEnd: number
-    caseSensitive: boolean
-  }>,
+  matchData?: Array<RouteMatchData>,
 ] {

(Note: TypeScript type aliases aren't order-sensitive, so RouteMatchData can be referenced ahead of its declaration without issue.)

Also applies to: 813-825, 858-863, 885-889

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@packages/router-core/src/new-process-route-tree.ts` around lines 688 - 696,
Reuse the shared RouteMatchData alias for every matchData element type instead
of repeating its inline shape. Update RouteMatch<T>.matchData, findMatch’s
return type, and extractParams’ return tuple to reference RouteMatchData, while
keeping the alias definition and existing type structure unchanged.

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes